]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
workspace: Use Main.uiGroup instead of global.stage
authorJasper St. Pierre <jstpierre@mecheye.net>
Wed, 11 May 2011 21:41:05 +0000 (17:41 -0400)
committerJasper St. Pierre <jstpierre@mecheye.net>
Thu, 12 May 2011 15:04:37 +0000 (11:04 -0400)
The mouse-wheel zoom "easter egg" broke when using the magnifier
because it was using global.stage. Fix it to use Main.uiGroup instead.

https://bugzilla.gnome.org/show_bug.cgi?id=649632

js/ui/workspace.js

index 728eaa5f011765101cc18d12b0537d4faf0dea9c..c06720db26af6dd21c2265b415f3878dc05ccbc0 100644 (file)
@@ -237,7 +237,7 @@ WindowClone.prototype = {
         this.emit('zoom-start');
 
         if (!this._zoomLightbox)
-            this._zoomLightbox = new Lightbox.Lightbox(global.stage,
+            this._zoomLightbox = new Lightbox.Lightbox(Main.uiGroup,
                                                        { fadeTime: LIGHTBOX_FADE_TIME });
         this._zoomLightbox.show();
 
@@ -248,7 +248,7 @@ WindowClone.prototype = {
         this._zoomGlobalOrig.setPosition.apply(this._zoomGlobalOrig, this.actor.get_transformed_position());
         this._zoomGlobalOrig.setScale(width / this.actor.width, height / this.actor.height);
 
-        this.actor.reparent(global.stage);
+        this.actor.reparent(Main.uiGroup);
         this._zoomLightbox.highlight(this.actor);
 
         [this.actor.x, this.actor.y]             = this._zoomGlobalOrig.getPosition();